Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 8 Jul 2010 22:47:34 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 8 Jul 2010 22:47:34 +0000 (22:47 +0000)
commit46cffcff2a35513b0d5d882a80970552b878d7d5
tree3bcf4e90ec0fcf2005158a3e775ff247178632d3
parentfa9aadc1a890eeaa6aa16b1408289f72032ed453
parenta9c70f37aec31ee68d182a2564fa5b9c67c1b1d7
Merge from mainline.